Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 19 Oct 2005 15:25:39 +0000 (16:25 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Wed, 19 Oct 2005 15:25:39 +0000 (16:25 +0100)

Trivial merge